am 229f354f: Merge "Make members of classes that are used with std::vector const"

* commit '229f354fdc2ff98dd6b1132ef5a5bd364c065079':
  Make members of classes that are used with std::vector const