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

Change-Id: Id89ad1e9f5e9801bd35e555f10f62775f85c1aaf