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

Change-Id: If1c73968f3b3e51b259f2279528803b1e28ee0b4