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

Change-Id: I44a72892edc792ad1f17dbce70385e0b9ddc624c