Android VTS 9.0 Release 7 (5338953)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXIf9jQAKCRDorT+BmrEO
eDKXAJ996Ny/Lhcf7zCia4yED8TRJ9QnnQCfR72hjyT38/M2m4yCkrZW0rsiDsQ=
=nXDd
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0