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

Change-Id: Ia35fcfad8e0910909c1806d95d3a8c0c33d954ff