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

Change-Id: I40ee4bef616c6dbff872f5bb106b3195a9e5be07