Android O MR1 IOT Release 1.0.7 (5157592)
DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I72c15a94a18a77657941b0838f0902d6b08e30c5