Android O IOT Preview 6 (4475743)
Merge "Have BC use default provider rather than always BC"