Merge "Fix exception of unregisterCallback when callback is not registered"
am: 43b75cad9e

Change-Id: I80436d7b921a99be91d0b3b97916728189900212