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

Change-Id: Ifff6c7b69ae3a3c31be1ed0af159f208e4e95719