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

Change-Id: I366a0968883a57499392edafcc95c53416268329