Merge "Remove unnecessary TEMP_FAILURE_RETRY." am: 9a14710
am: f13975b

* commit 'f13975bae017f45c68c617b5ed489547d889a147':
  Remove unnecessary TEMP_FAILURE_RETRY.

Change-Id: Iac2eb4db4e502ad842346d95a71e945f9efe92b9