Merge "Remove TEMP_FAILURE_RETRY for unlink"
am: 7c06aef

* commit '7c06aef061fa176331b77a88c1ff2c6ae401a5f0':
  Remove TEMP_FAILURE_RETRY for unlink