Merge "Rename SDK_VERSION_O to SDK_VERSION"