Android O MR1 IOT Release Smart Display r39 (OIMJ.201212.001)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I9dbaebc5cccd62b8124f86682f83d56508fd6935