Merge changes from topic "update_profile_api" am: dced19175b

Change-Id: I512066421204d53b25bdbb0e843c9fe6cca170ea