Merge "Clear calling identity when executing the callback" am: 9fc2483fb4

Change-Id: Ibbb2de1d198f3ce17cbeb81dd10fdb9e592435ad