Android 8.0.0 release 26
Merge cherrypicks of [3113423] into oc-dr2-release

Change-Id: Ic35d31e379cfa18be3204adc73d3159eb06ba3dc