Android VTS 9.0 Release 8 (5409071)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXLUA9AAKCRDorT+BmrEO
eOggAJ4s4Np6eEhNHhRZnK7oar4TvzoyXgCeIJIkn7FilVWwhyoqeB51XF/r3Bw=
=b83a
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0