Android 8.1.0 release 48
Merge cherrypicks of [4897833, 4897834, 4897835] into oc-m8-release

Change-Id: I641b54fb04008ba92c1fc4473ddfccabe947ab7e