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

* commit '5d543acd5dbe8c06e5b8a40b0a12e3438df6c645':
  Avoid single expensive test in 530-checker-loops.