Android 8.0.0 release 33
Merge cherrypicks of [3142853, 3143530] into oc-dr1-release

Change-Id: I318fc1e3000d52dfe2f1c1142b4317d2adbe3c09