Merge \\"Revert \\"Gray only immune objects mutators access.\\"\\" am: 105683791e
am: d3b2b36186

Change-Id: I317a09cbf2bfc5e431fca4e4d4a1a575a9c7516c