[automerger skipped] Merge "Add the missing unregisterCallback call" am:...
[automerger skipped] Merge "Add the missing unregisterCallback call" am: 7b15fd37 am: 7b59278f -s ours
am skip reason: Change-Id Id7fb72c42dc67f89ceef93d937241e1584b853e7 with SHA-1 279a5ae3 is in history
Change-Id: I4eda96985cbb75ef6e51d4e5c372b0e0cba520de