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

Change-Id: Iaf5b6fbfa1754c4a4af0c7306855c36e71e2bcb3