Android O MR1 IOT Release Smart Display r39 (OIMJ.201212.001)
[automerger skipped] Merge changes from topic "discard" into oc-dev am: d16862a25e  -s ours am: 7077074bd0  -s ours
am: b254bf3d8c  -s ours

Change-Id: I6469356f87edcde507aa88c12f5b74ce45a8da55