Fix overrides work correctly in virtual-mcp-pike-dvr

Change-Id: Ifb1381276ca0a79884cc09e380af4e02ac58360f
Related-Prod: PROD-18328
Related-Prod: PROD-18446
3 files changed