Android O MR1 IOT Release 1.0.7 (5157592)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I5af29bcdea90ac9e562f6db0f3ce723b7720667a