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

Change-Id: I3825c4d04e033e74b9136276ff22db0a79da4aec