Merge "Perform userdata backup for all matching rollbacks" into qt-dev
am: 33946144bd

Change-Id: I34ad8d94c90a76f422320dbdd6fbed6318bbe878