Merge "Structure layout logic cleanup." am: cdaa220180 am: 0932a27903
am: 59f6fc35e9

Change-Id: I9beb6e25d2bc74df2b81f073967871d1bee0bd41