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

Change-Id: I9d652008a66eef88d5b56741bdea4abc76f383ec