Nuke htc common

Change-Id: I2f240c630a3b13749d141c94e2b4668a18b174d4