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

Change-Id: Ib0285d815731cf3ef6ed4c06272584284d54209a