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

Change-Id: I831da22186f326cc9cccade1b5d5e006c252a802