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

Change-Id: I8d095bccdaae4b6383fec6d85d76209a706ca2cb