Android O MR1 IOT Release 1.0.7 (5157592)
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I162e957ea09d7c8c9ab9cfce18f5884df9f50be4