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

Change-Id: I52b5e5a7c093ec41d85da6c0665517f41457b2be