Merge "Record post startup methods in profile"
am: 4bbbe4006b

Change-Id: I0df313d908ff8a4cf28f88228d197986ee8a5ff9