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

* commit '27c52b1cc7b4d271f5ca2beacb3439f5bede19e4':
  Fix falkiness in 117-nopatchoat