Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev am: c87fcb0963
am: b0ff5e511a

Change-Id: Ieb4f9a723215946835c0a9448c8cac464a6ffc0c