Android 8.1.0 release 14
Merge cherrypicks of [3389262, 3388995, 3388996, 3388550] into oc-m5-release

Change-Id: Ib2b0b70955502087d78649901392eade412efd8d