Merge "Make ext4 userdata checkpoints work with metadata encryption"