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

Change-Id: I08fd68e3dafbc0a86faa05d120d4a6a3681106a2