am ae76eb79: am 49e73d48: Clean up public API of SubInfoRecord. automerge: f5b56e3

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