Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
am: 8521eebfad

Change-Id: If523c47be47a0c1f251124c0607802068fd14900