Nuke htc common

Change-Id: I492223dbd959f44c799d940676859640c4027022