Android O MR1 IOT Release 1.0.5 (5014699)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW7UVlgAKCRDorT+BmrEO
eAj8AJ9oXcNo03BMhb6ZiQuyRSPvtFDhPwCfSLG2ZhoHFmK3qcqBUQPi4E3oRuI=
=Lagb
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0