Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b
am: b6290ff39e

Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288