Android 8.0.0 release 34
Merge cherrypicks of [3074405] into oc-dr3-release

Change-Id: Ia2cb71fc1d5a647a565c6311ce80f1de08e905db