Merge "Revert "O is API 26."" into oc-dev