Merge "Revert "Structure layout logic cleanup."" am: 0c9cdeab75 am: 0bf0560e1f am: f06df0b5ad
am: b0c7a87260

Change-Id: Iafa38c0a3bb064721e060262a08ccf08d0ca86d3