Merge "Structure layout logic cleanup." am: a71938846c
am: 21d87190ce

Change-Id: I5f63f1fe58d1d5ea90517cfc10c396844bc5a7e9