Merge "Perfprofd: Generalize post-collection handling" am: 61fb5fe766 am: 45c9223598
am: 6e75f3f133

Change-Id: Id39321c205916115169b6250a29a62f5568d1168