am 8ea0d19f: am 93b42924: Merge "Fix immutability bug in http://ag/587241" into lmp-mr1-dev

* commit '8ea0d19fe2522ceaf5f09808b7835deb9e53c88a':
  Fix immutability bug in http://ag/587241