Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev am: 70a2316ec7
am: 362a819a46

Change-Id: Ica34b713dcb76de186221caf3ea158a5125903b9