am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev

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