Merge "Fix regression in PFD#fromData" into qt-r1-dev
am: 1775a48935

Change-Id: Icf8fb72af14eb1cd16765a36e9fca4f9f5fdb265