Merge \"Fix ShadowGrid in UiBench\" into nyc-mr1-dev
am: 0c05a3dd1c

Change-Id: Ib0bdaa1f80e05f6409cbeb643e0708fac684b097