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

Change-Id: I3fec2d846f8af1880266a4bf7c98f5b06674b04c