am f6309600: am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"

* commit 'f630960088b2fbdb7f147bf9f7a137850df4c89c':
  correct the setenv option judging condition