Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev