Adding fix for data urls in images

Change-Id: I84fa78c91a337b417e824f8c9cc45271830906f4