Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev