Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev