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