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

Change-Id: I7b7dfe8dc85d9ddc1f707f3335d41a6510613680