Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am: 68c263cf2e

Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2