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