Merge "MetadataCrypt: remove unnecessary retry loop"