Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev