Structure layout logic cleanup. am: 9435054995
am: 4e0870251b

Change-Id: Ibe91d0e0853bb2262e58bdbf4062304e6838fc21