Merge changes I7da699ca,I5a09efef into rvc-dev

* changes:
  MTP: Fix MTP SD card issue
  MTP: Add MtpDatabase unit test