Android VTS 9.0 Release 9 (5512091)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXNxNwAAKCRDorT+BmrEO
eJZuAJ9ldmuXcbHLr6ZOdFa76XuBD/bBSgCcCajWCKCCDgfcF0Gt3zYnS9cP7iA=
=Irk2
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0