Merge "Call restoreCallingIdentity in finally block" into mnc-dev