Android O MR1 IOT Release 1.0.4 (4973263)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW5Ao/AAKCRDorT+BmrEO
ePuzAJ9+/enpoeL4qTEL3u9GW187tLKI0ACdGZ4ipGUOIcHhQ3vZacswtDWHZT0=
=Zzb9
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0