am e3cf96cc: am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev

* commit 'e3cf96ccbe200c4bd3d007eecd3ec83e4a0b5125':
  Use correct pid when running under test harness