Merge "Revert "Structure layout logic cleanup.""
am: 0c9cdeab75

Change-Id: I01334181e0c8a98f10586bc588ff8fbc0e75076d