Android 8.0.0 release 9
Merge cherrypicks of [2749915] into oc-r3-release

Change-Id: I773b10ffff948569b29486112c695ed22d3f24b5