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

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

Bug: 120502534
Change-Id: I3547ab297163ddea6ad2dcfbf6ba1a8e0d2c6c74