Merge "Allow vendor_init and e2fs to enable metadata encryption"