Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev am: 96b9ddbcb2
am: 4d47cb3ddc  -s ours

Change-Id: I1263c171d5f348fc9dd2ef39255bd8ce5d449338