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

Change-Id: I69998bdbbeb96fafb243b26945622e7a146d5403