Avoid class name conflict with core

Change-Id: Ic474bd5677817f36365e38a3f65c68670fdc22f2
Merge "Avoid class name conflict with core"