Merge "Clean up local hprofs" am: 9ab94e15c7
am: 1876d82450

Change-Id: I16c2e27c21d933e6090adb48af144c731a2c8ac6