Merge "[automerger skipped] Merge "DO NOT MERGE: Update magnification region before the test." into oreo-cts-dev am: 6c959b0878  -s ours" into oreo-mr1-cts-dev