Merge "Declare visibility on class properties of SpecialUndelete"