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