Android O MR1 IOT Release 1.0.4 (4973263)
Merge "Fix warning of unused parameter." am: c42a87ece8 am: bde0da845d
am: d4ca4eae80

Change-Id: I4d012ef759af8a8c8c7119500834358c34cf883e