Merge "Test staged rollback for apk and apex install"