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

Change-Id: I7ed1786c6e10fbe404c4a36a5fd22443ce4c52c6