Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev am: 925abb706e
am: d820ac190e

Change-Id: Ic0eab4ae3869cadc8bc1343053be94d620ebb30f