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

Change-Id: If1c73968f3b3e51b259f2279528803b1e28ee0b4