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

Change-Id: I5a9ca31e3748f741c3769efaf85b8b80efea329d