Android O IOT Preview 8 (4718959)
Merge "Email: Fix StoreTests"