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

Change-Id: I0657a94c14b76931eda934f822f2fb985ea50f88