Merge "Adjust tests to new android-support-test + espresso libraries." am: 809062c26d  -s ours
am: db3a1f2882  -s ours

Change-Id: I5b2d7de32ee3c9d88de73d0aae3c9e2ba9c05f62