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

Change-Id: Ibc8cda63fbb457fafb4a14e4b34d51a1bb1b5a26