Merge changes from topic "move_profiles_cherry_pick"
am: 6903181683

Change-Id: I3595b7f281e7af7fb6bd78c5570db89560f3364e