Android 8.0.0 release 34
Merge cherrypicks of [3142780, 3142509] into oc-dr3-release

Change-Id: Ieb6731674fa6026bf8b90b89eec802ac1567b30c