Merge "Remove TODO for service registration."
am: 6f1eed673b

Change-Id: I78fbecf63a23719fb7c10152bdd471ef4f92a9e9