Merge changes from topic "exfat-update" am: a2a227e382
am: 1fe4696cdd

Change-Id: I9cb8a26f769309ad16cf780c9a40d64af175a2c9