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

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