Android O IOT Preview 7 (4635859)
Merge "Fix warning of unused parameter."