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