Merge "Perfprofd: Change config proto"
am: 08af8e6eeb

Change-Id: I655df1c8e512a348f813d967035bacafb19601f1