Merge "Update preferred payment related APIs"