Merge "Structure layout logic cleanup."
am: a71938846c

Change-Id: I1e3324faa22f67d947bb8fff57183ed64b9e6ea0