Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade"