Android O MR1 IOT Release 1.0.4 (4973263)
Merge remote-tracking branch 'toybox/master' into HEAD
am: 7f7fef7c0e

Change-Id: Ibcadc92493e6c5eb3e126f99311dda8a6e00d2d2