Android O MR1 IOT Release 1.0.12 (5501548)
Merge 4.4.82 into nyc-iot-dev am: fbc4ea9a08
am: 452daddbb5

Change-Id: I51514c2ca1a8fff6d0cd79c96dd00e56f15e2ab6