Android 8.1.0 Release 35 (OPM2.171026.006.G1)
Snap for 4603989 from 5c8518b598845429832d3ac5cda3b352688bfcd0 to oc-m2-release

Change-Id: I2c4d5a6d27428e3f499cf9433016003c7198c8ac