Fix duplicate codes

Change-Id: Ia37e522688a4acd9a8b9b628b03985b7c31d1354