Merge "Avoid single expensive test in 530-checker-loops."
am: 4e4e64511e

* commit '4e4e64511e530db37b33f450016afe49db3c4b20':
  Avoid single expensive test in 530-checker-loops.