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

* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
  Clean up public API of SubInfoRecord.