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