Merge "Clear calling identity in finish callback" into pi-dev
am: 2f426bcd09

Change-Id: Ide17dbc9159085c4367644a891e82c40247ab9fa