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

Change-Id: I679d9ff29281d20ffc131ed24824657a2faefc0a