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

Change-Id: Id00238116539f66d7799d685422b7999281ce425