am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89

* commit 'a93dee63de4ce37343577e171571ac9e1d6effa0':
  Clean up public API of SubInfoRecord.