Android 8.0.0 release 32
Merge cherrypicks of [3105957] into oc-r6-release

Change-Id: I7a0432076893ca05631540b6a842c972f52096f7