Merge "RESTRICT AUTOMERGE" into oreo-cts-dev