Merge "Improve work profile unification flow" into rvc-dev am: a042c8af am: 25c8ff5d am: 629b35bc Change-Id: Ibc7f6a16dc0983a9290b8d4add06c6ae796fb8db