Merge "O is API 26" into oc-dev am: 074a67c116
am: 8433705f77

Change-Id: I8e394ffd699c115b316f3b6d2430ae75325d4047