Merge \"Revert \"Revert \"Gray only immune objects mutators access.\"\"\"
am: 60245ae995

Change-Id: Ibc8159084f8ba014db7380fca1fc3401b7313a01