Android O IOT Preview 7 (4635859)
Merge "Build with core_current"