Adjust grid item layouts to match mocks.

BUG=24326989

Change-Id: I8a4133890036a2ef9173f20828f062a7e991525d
13 files changed