Android 8.0.0 release 10
Merge cherrypicks of [2686350, 2686440] into oc-r4-release

Change-Id: I2398535d2be0bd039cf9ea5417b15933515f405f