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

Change-Id: I53169cfad9f200af3e8b6d56d21a62c0d7fd593f