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

Change-Id: I60fa3dd657897972dd6bdfcc2cc0a6967ac4a861