Restore XML-RPC retries, with better logging

Bug: 974352
Change-Id: I72ccf3e127d45c5ab9917a92663cbbfdfafcbe9b