Merge "Fix HPROF DDMS." am: b1c724cc1e
am: 089a9c5d02

Change-Id: I54dddfbbee0645b92bf2cf4e586a1e71447d4687