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