revert I057b7ac0 now that the layouts are the expected height.

Bug: 6546766
Change-Id: I736290b897b864228ecc3e46d86ef566efda1efd
2 files changed