Merge "Override phenotype flags during tests" into rvc-dev am: 37931b46 am: fdcad136 am: 6c8ac4a7 Change-Id: I98fa1e651a7e7dca96f6cf1cbc5bc633e837d509