Merge "Revert "Record post startup methods in profile"" am: e63a9111 am: 8a462a5e am: 3e7fbe67 am: 06c0ef1f Change-Id: I8d095bccdaae4b6383fec6d85d76209a706ca2cb