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