Android o preview 3
merge in oc-release history after reset to oc-dev