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

Change-Id: Ib3830e489735019aaa0410bef2282ea80d70cc01