Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df
am: c96a358318

Change-Id: If16a559a068f93f79c7c398323fe3f1bafe1aaf9