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

Change-Id: I2471499491c45980a442c4992180d0bbb8bc35c3