Merge changes Ie35da00b,I08b8367a into klp-dev

* changes:
  Avoid NPE when checking for empty volume.
  Get FAT volume ID through vold.