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

Change-Id: I0749d44c2963cbacbb3f44b04ad8ba80de2e9b87