Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: f9e6cd001b am: dfbec87e86 am: 290e2f19dc
Change-Id: Ice2ded49d82deb6c593724041dd8afa1ff986575
This commit is contained in: