Merge "Remove missing object to avoid NPE" into lmp-mr1-dev