Android CTS 6.0 Release 7 (2906653)
Merge "Remove backup file."