Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 3f0c3e900c am: d9ff4c126c am: a346681bd6
Change-Id: Ie235aecd6e1127d60dad1c608dba04fa2663ae73
This commit is contained in: