Merge \\\"Revert \\\"Revert \\\"Gray only immune objects mutators access.\\\"\\\"\\\" am: 60245ae9 am: 68493aec am: 5996d614 Change-Id: If84f83b6ea2940f75ed56e709bf775c1de5634e5