Merge "Fix the prefix matching for uncrypt status."