am 843133cd: am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8

* commit '843133cd835b2923453bba95599aefa48fe8cb20':
  Fix NPE when parceling SubInfoRecord