Merge "Revert "Added a flag to APIs for rsObj creation""