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

Change-Id: Ie5bcfa449bfbad2ef0800f86a989db92d2c19087