Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge: c7f1ae8

* commit 'c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
  Fix NPE when parceling SubInfoRecord