Merge "Multi-user and WallpaperColors" into oc-mr1-dev am: 22b418448b
am: 430d7450ed

Change-Id: I65ff692f77886bfed6f64ec71f0bab569a6354c0