Android VTS 9.0 Release 10 (5774513)
-----BEGIN PGP SIGNATURE-----

iFwEABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXVXWGwAKCRDorT+BmrEO
eAkpAJUUJT+LlCGmzrfiYQxh5P2SsmaZAJ4zNrFLl3o0VPT3mxBWTkJFHuSf2w==
=Oon+
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0