Rename registerServiceWithCallback am: 7ce3155ab3
am: aa14643441

Change-Id: I2d9f02beb6e541afeaf6e5df534d617ee003bc59