Merge "Perfprofd: Fix service definition" am: 29c43e612c
am: d638c20171

Change-Id: I5427328121c632013bc80b8dca503fc807b7c5d8