Merge "Fix unregAll throwing Concurrent exception"
am: 824d9c61dd

Change-Id: Ie12f52b261a305f9320ec7583099932505ce2d20