Merge "[CallingIdentityTokenDetector] New issue - result of clearCallingIdentity() not stored in a variable"