Merge "Revert "Record post startup methods in profile""
am: e63a91111d

Change-Id: Ia0f9e2309da1bb25c456fdf22c56353a3560348b