[automerger skipped] Rename RollbackData to Rollback. am: 91fc4db14e am: b646e555e8
am: d0d7a014c3 -s ours
am skip reason: change_id I5ae3866753d6badcdf019525b40522937568dee5 with SHA1 8d512eeb95 is in history

Change-Id: I3868320800f49610eb2a9b6eb782fc9f231f1924