Android 8.1.0 release 12
Merge cherrypicks of [3400059, 3399862, 3399399, 3399400] into oc-mr1-release

Change-Id: Ia9220e9fb9bbd1c6cd4681183b4cfcf933ce677e