Merge "Rename 'file-session-key' in api message map"