Merge "Call system service API instead of checking the phenotype flag directly."