Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
am: 6a2ee3b180

Change-Id: I28f5b461d1c0e7f25868af780125c2f8ba356a89