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

Change-Id: I40b489172034036d112d367c183110ae9d9408db