Rename registerServiceWithCallback am: b4abef9b0a
am: 9da4d5a5e0

Change-Id: Ibba2b1c59944de979e32a6284c1a86a5ae5842c3