Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am: e09e5ef21b  -s ours

Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b