Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main