Merge "Dump startup and post startup methods for --dump-only" am: 11d72c608e am: 538623e744 am: a2b576549f
am: 38e548ce7a

Change-Id: I4fa0d5cc3a029eeeeafb3a3f9d7b338af84322c8