Merge "Clean up local hprofs"
am: 9ab94e15c7

Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da