Merge "Set ro.crypto.type even on failure"