Merge changes from topic "update_profile_api" am: dced19175b am: e035a12367

Change-Id: Iaa111d4a20144a0a555bc617c3e7db86d09cb21a