am 7f61d2bf: Merge "Don\'t TEMP_FAILURE_RETRY calls that can\'t fail."

* commit '7f61d2bfcbe5c3f984138d08676d61f1dc8224fa':
  Don't TEMP_FAILURE_RETRY calls that can't fail.