Android 8.0.0 Release 36 (OPR5.170623.014)
merge in oc-release history after reset to oc-dev