Implemented addCallback() and removeCallback().

Change-Id: I8e812078a30828bf0e417745fc4b6ce1d0be916f