Merge "TIF: fix issue of using caller-aware methods after clearCallingIdentity()" into sc-dev