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

* commit '95ada14315a8ed5650508342a673710b3504af7e':
  Remove missing object to avoid NPE