am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer...
am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
Merge commit '8b5161c2'
* commit '8b5161c2':
An attempt to unregister a handler that's no longer registered should not cause an assertion.