Android Wear O Preview 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWdLTqQAKCRDorT+BmrEO
eDKWAJ4jWq2V8hMcp1bT8m5zT4Ve19jE8wCeKueSyAdBhumkiPf0eQEyLeC/B7w=
=1Puf
-----END PGP SIGNATURE-----
Merge "Remove an Android change that is causing a test to fail"
am: 49edf3ace6

Change-Id: I5a86265b57641be1ddd39c073588aa33d99e5b27