Android 8.0.0 release 28
Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-release

Change-Id: Ie7ce56fc2915e78fca4f280f533154e74fc786fd