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

Change-Id: I0d3b8e3225f793d99d4366267b6d8f2142905e4f