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