Rename registerServiceWithCallback am: b4abef9b0a am: 9da4d5a5e0
am: cd0410fd3b

Change-Id: I6de9395c8b4708cc3a8f5caf963397e4f05d2fb7