am 216a9b17: am 03337715: am 1b495f52: Merge "Add default wallpaper to picker" into jb-ub-now-indigo-rose

* commit '216a9b17f11dd781b70917e289cae1b3e13958ae':