Merge "Layout code items of post startup methods"
am: 2ebc76e665

Change-Id: I59af0de0ac57de2e27a555591c6eb720d12aef2f