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

Change-Id: I8c2ec1214e754e86aa0a254287bedfad099c125f