Android 8.0.0 release 31
Merge cherrypicks of [2986365] into oc-r5-release

Change-Id: I28dd7901d00f9391e4640867003ab24a8ce43d68