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