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

Change-Id: I665d86c28cbec7fcb11ed096d59b3bacdb17b552