Fix for Metadata for httpclient5

Change-Id: If0e43f8b20420d147829f428a2d3f832d9d84f67
4 files changed