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