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

Change-Id: I68dbbffbf9966372daedd1eec7939617bc460fee