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

Change-Id: I4e8861233e18706fc6a5cf4dfeb7c04288d73d16