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

Change-Id: Ia6258df059599de4adf055d71b2a2c4d926a29e0