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