Merge "[automerger skipped] Merge "DO NOT MERGE: Change the way that find UI elements" into oreo-mr1-cts-dev am: 7ddf1a7df5  -s ours"