Android 6.0.0 release 3
Merge "Remove backup file."