Merge "Adding support for overriding flag values in test" into tm-qpr-dev