[automerger skipped] Merge "Clear calling identity in callback." am: 0b4026b345 am: b7bebbc3fc
am: 6395b33290  -s ours

Change-Id: I3560b5ee373b194efd986e908dc7cfa6e482fdcd