Continuing to redirect old content to newer matches

Change-Id: I925bd796de85dfe69fc987826a02b11c0c58f39a
Partial-fix: 1191447