Merge "O is API 26" into oc-dev am: 7cc3f0a909
am: a51923896a

Change-Id: I3ea264c906559df8ef4dd109166f89cc0cf366b0