Android 8.1.0 Release 35 (OPM2.171026.006.G1)
Snap for 4384531 from 2e1a26a330bc17f56b64fb3791e4459a586b6e9e to oc-m2-release

Change-Id: I8200a38422f4f5e7fda65941b865c75ad1ef2d95