Nuke htc common

Change-Id: Iaa7b2e5684a823ff275830d85537342b68c7d99e