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