0a7ff8780f
Fixes 217564863 Test: manual, changing grids from Wallpaper & Style and checking against spec Change-Id: I94cf77111b37810282527f1a212b6e4126d3eba1