Merge "Add startup/post-startup bits for random profiles"
am: 2cda354d7f

Change-Id: I3ab1f1d4afa4019312e6710a5b8424c70919e1e3