am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"

* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
  bug fix possible NPE while startProcessLocked()