Merge "Clear calling identity before verifying listeners" into oc-dev
am: 43dd3ba3c4

Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c