Android 8.0.0 Release 35 (OPR4.170623.020)
Merge cherrypicks of [3084423, 3084424, 3084425, 3084426, 3084427, 3084428, 3084429, 3084430] into oc-r4-release

Change-Id: I049a4d62c18d3067031d1c5e3c75c21cccd2d07b