Android O IOT Preview 8 (4718959)
Merge commit 'acd09985ff0da954f51d45045f81e876a63f7650' into HEAD

Change-Id: I8531c35c198af08fdd3af00f049ce3fedcbae912