Per current guidance remove legacy markings. Change-Id: Idd9e17b79c5de9206153f3c32965b519665b6a3e CRs-Fixed: 2229655