Merge "Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev am: 9dee975361 am: f35953a7ae  -s ours"