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