Merge "Crash during OTA merge may lead to blocks with stale data"