Fix tid overwrite and save features' brokage for HK Change-Id: I71985a73f65ad4ddf79ae9a2efb00c5de12b9cd8