Merge "Merge "Ensure race between rollback and roll forward is properly...
Merge "Merge "Ensure race between rollback and roll forward is properly handled" into qt-dev am: 07a9e9f9" into qt-dev-plus-aosp
am: 20196738
Change-Id: I1f7f2fe54fbd35e36d459730746ce5f906d69f85