Revert "Remove functionality of use_target_name"

This reverts commit 6c08d220816219361bc6ad3c18479a353c995bb0.

Reason for revert: Missed a spot where use_target_name was still used.

Test: CQ
Change-Id: I2c6a3b281b82d89f9f042b641938f7452022c02b
1 file changed