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

* commit '93b429247673bb8e019fe9d39b46700fc86c3313':
  Fix immutability bug in http://ag/587241