Merge changes from topic "move_profiles_cherry_pick" am: 6903181683
am: c1a3a73562  -s ours

Change-Id: I851b26a65b8dc6ea43977b157d13d91960e0ed44