Fix up layout changes as per redlines.

Change-Id: I3f48a9e919312a99b455cd8634b749dc6cbffcc5
15 files changed