Remove unused xml constants

Change-Id: I38d720095a2fe703e55d895350e3894c35649d4e
Merge "Remove unused xml constants"