Android O MR1 IOT Release 1.0.10 (5360514)
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I9001cfe814ae4ab14fe642e132074a0a624e1e95