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

Change-Id: I455ae6d0552232647409482479bae5a41189faa9