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

Change-Id: I5744d28ade747627b5296cfa8f04ff44b71c38ab