Android N IOT Release 2 (NIT1.180611.010.B1)
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"