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

Change-Id: I92a2392d8d017759da671e25d98ebcf475c4a877