Merge "Override phenotype flags during tests" into rvc-dev am: 37931b46 am: 9d1924be am: 2b0bd95d Change-Id: I232d21def976a8b087ee65688c8ff9431ea109e3