Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev