Android O MR1 IOT Release 1.0.12 (5501548)
DO NOT MERGE

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

Bug: 120502534
Change-Id: I82798096e35a08d79d009cb292e3fc9b70cc34d7