Merge "Fix testSyncFiles_extStorageVariable and testSyncFiles_normal" into lmp-sprout-dev