Nuke htc common

Change-Id: Ia0962c089636a4e28cebbc953c6c64fd1604c5b6