Android CTS 6.0 Release 16 (3736419)
Merge "Remove backup file."