Merge "DO NOT MERGE: Change the way that find UI elements" into oreo-mr1-cts-dev