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

Change-Id: I91b92f2cc5255124884c39cfddc449479efa7255