am 2c237f11: Merge "Fix invalid private access."

* commit '2c237f1146ebc4385a9a0a0c6f9365aa09db5b24':
  Fix invalid private access.