Clean up public API of SubInfoRecord.
automerge: f5b56e3

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