Merge "Clear calling identity in callback."
am: 0b4026b345

Change-Id: I5c7c100179ff39a71b01a0131e5c477facf9d952