Android O IOT Preview 7 (4635859)
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"