Renamed HandlerRegistration to Registration

Change-Id: I29f6bf682cb0fe6a80f8f92b2581a2fe93bf01ea