Android O IOT Preview 7 (4635859)
Merge changes from topic "neven" am: b06c7cc52e am: caf2eef611
am: 221bd13118

Change-Id: I1bb0394448af47d2fb5dbd97087609b036c9aee3