Merge "Revert "O is API 26."" into oc-dev
am: 6f93dd52b2

Change-Id: I0a1678c8f4060df7fe07c57f062bc446cdeebdcf