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