Merge branch 'CR_1287_FAT_MOUNT_FAILED_samin.guo' into 'jh7110-5.15.y-devel'