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