am 45038ae4: am 12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"

* commit '45038ae483313a5cc445a90fb0499d4c6ad69b1d':
  Correction to use of TEMP_FAILURE_RETRY in send_prop_msg