Android 8.0.0 release 12
Merge cherrypicks of [2835144, 2835145] into oc-r6-release

Change-Id: I6e7b3c4fe6031b93a162e5569ae92a54802b64a5