Android 8.0.0 Release 35 (OPR4.170623.020)
Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-release

Change-Id: Ib1bdd5bfd64e3b3f85d864270c1ff688da4df672