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