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

Change-Id: I8b6ef6cd6f516a6e8ff244f0f80de74938a8d565