Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am: 68c263cf2e
am: 5f0e81222a
Change-Id: I11576bc92d1b3f80780efb4d46d963eea2176de7
This commit is contained in: