Merge "Structure layout logic cleanup."
am: cdaa220180

Change-Id: I6c75d7e2400b2451612c1461fc94282c29223198