Merge "Remove perfprofd reference." am: 97c06703f6
am: 03cca21541

Change-Id: Ie9e1f86fdbfaa5e1f73fc6d1e4f052c90412b85c