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

* commit '1c0e2f0af82c2dedb4919e935e911edb9d0f6830':
  Remove missing object to avoid NPE