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

Change-Id: I924a4f9a85261dc4b2249e8c5047df270b3ef0c3