Merge "Perfprofd: Update proto config" am: 455413b218 am: c513ffe62f
am: 3da7f8ab95

Change-Id: If7167ec9e285b2eb39466a74a62bb170393cb6e7