Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev