Remove ComponentLocator which conflicts with package name (#13729)

Change-Id: I771d827ab88f005f8cbef6c6cbefecb1b3f498e0