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

Change-Id: I03ace66a760ea1e74770a7a0838d3f36652d26b0