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

Change-Id: I9fa45bee6ad65be37da156b123ab93736dc6ae08