Merge "Protect filename_cache with lock in ota fault"