Fix missing grid for devices that upgrade from R

Fixes: 178435615
Test: TODO
Change-Id: I9894b88485daf5b641b4674a5abff05e0f53138b
(cherry picked from commit a62e49b365739d8b3c918380c316e65376de085e)
3 files changed