am 25ec2c19: Merge "Fix falkiness in 117-nopatchoat"

* commit '25ec2c19b1e1e1e712b916da7da429877841d3e8':
  Fix falkiness in 117-nopatchoat