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

Change-Id: I0a8893e32e2d14a48c7f98142373e3c681129c8b