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

Change-Id: Ifa8cc2718ec176143c835c824c09cccb747914b0