Merge "Move deletionhelper test package to sdk 26"