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

Change-Id: I93fb68464534882902eaae6fe3c16e8a796ba5ef