Merge "Fix NPE in onCreate" into lmp-mr1-dev
automerge: 4d5ac7c

* commit '4d5ac7c1f50bef8949e3427aa3c9e78cdbf35aff':
  Fix NPE in onCreate