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: I7d50cf8c92a0e933b421422ccfa02d73af535be0