Merge "Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef2 -s ours am: 57d0423e -s ours" into oc-mr1-dev-plus-aosp