Android 8.0.0 release 31
Merge cherrypicks of [2805728, 2805966] into oc-r5-release

Change-Id: I448e262d28436d256d901d86f9acc3549a6cc9c9