am 1334c9c3: am 1c0e2f0a: am 95ada143: Merge "Remove missing object to avoid NPE" into lmp-mr1-dev

* commit '1334c9c374f1644a42be38402a67d103fd5774a3':
  Remove missing object to avoid NPE