Merge "Remove a duplicate TEMP_FAILURE_RETRY." am: 166c6a4390
am: 0b8a47c55a

Change-Id: Id132b10cdf3877ed06bc7cf471ef16f98aba1137