Android VTS 9.0 Release 6 (5264840)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXGRvYAAKCRDorT+BmrEO
eAUCAJ0R1WzVcYJcmrS/79cvxwZAhdOZvQCghNdQIWYF4oPEKttM3c8s/T/BKtg=
=JnPv
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0