Per current guidance remove legacy markings. Change-Id: Ic2fdf678fab90f204c59cc0cbfe616d115b0d6b9 CRs-Fixed: 2230684