Added fix for non-UTF-8 encodings in web data

Change-Id: Ice02e9e6b0f7017344bcc57083899da4c67658f1