Merge "Wrapping new api's with proper RS_VERSION"