Merge "add override annotation in HttpFileManagerImpl"