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

Change-Id: I0a84ef4f43e10cc9692b5541eb3379b042daab17