Android 4.3 release 2
Merge "Detect and handle invalid number of FATs"