Merge pull request #635 from google/fixauto

Fix auto glitch test