Preserve attributes on rollback.

Bug: 211570674
Bug: 195477363
Test: atest
Change-Id: I1b0e7ab1f551eed2bd35e849462f0c30ce42166a
2 files changed