Android VTS 9.0 Release 5 (5140538)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXAnf9QAKCRDorT+BmrEO
eCy6AJ0QU9MSxVpb0hArTt++M3I9LTDUlwCcDZMd35ft7ngiPYLoyiKNvyj2WNQ=
=2HNn
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0