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

Change-Id: I8eaea581cfda4844c3ea81f7ee63f0cfc40ef3e0