Holding an object lock while macking the callbacks cause deadlocks due to reentrance to the callabck notifier. Change-Id: I5f2780989798ebf5c5d7aab34ac233bb5952079d
Change-Id: If57b536ae6b1f9bad4213630488591a3b3cc9fdd