Merge "Fail to enable rollback if enable rollback times out" into qt-dev
am: b273078adf

Change-Id: I70d3646dcef80e0bc9ba1034a3103808f1079d99