am 661cb3f6: Merge "Add more environment variable to control test granularity."

* commit '661cb3f65d3d6fd09f4823f4519890646260fbe6':
  Add more environment variable to control test granularity.