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

* commit '1c0baa1aefd84c7cedf645be0e8086e7b488bc4e':
  Fix NPE in onCreate