Merge "Fix bug where fingerprint events can be delivered to the wrong client"...
Merge "Fix bug where fingerprint events can be delivered to the wrong client" into nyc-dev am: 95205053
am: 29900ea7
* commit '29900ea7':
Fix bug where fingerprint events can be delivered to the wrong client
Change-Id: I49d7088704373a1c2a6b77c6b3dbe0123ccca058