Android 8.0.0 release 34
Merge cherrypicks of [3138611, 3138612] into oc-dr3-release

Change-Id: I327754910d08479f91343d4cfa98eef8032f5978