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