Merge "Change grid decoratoration to match spec" into pi-car-dev am: b42e2594bf
am: e95cc76b05

Change-Id: Ie18c2521ee4702d80baa765d65e7a88eb8e7cd09