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