Android O MR1 IOT Release 1.0.5 (5014699)
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22d02e1a04  -s ours am: dc0b732692
am: a2a31e9215  -s ours

Change-Id: I9bd797287fd865ab1583b2fefcd7d3828ee7c496