Merge "Revert "Define FLAG_MUTABLE and add a compat change for explicit...""