Android O IOT Preview 6 (4475743)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWi7K7AAKCRDorT+BmrEO
eJM4AJ9sDVRsHLf7cw4RCb4M5R0NtEmQ4QCfbyHSsjQgAnLAXmYHL2mEnMDFsIE=
=TryE
-----END PGP SIGNATURE-----
resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aosp
am: 88bb68148b  -s ours

Change-Id: Ia01e3a737ad6af93a3549b9db4703b629cde34e2