Android O MR1 IOT Release 1.0.5 (5014699)
Manually merge changes from giant AOSP topic

Change-Id: Ibcb55155d2c3e9afb9f6f023dba3bac11da223fb