Fixes: 134053456 Test: With work profile and fully managed device, strings are correct Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158
Fixes: 110907543 Test: Builds Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050