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

Change-Id: Ieefa30f3c279255852829265f7a764e9cae4f3bc