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