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

Change-Id: I8bd5bd2d779fe838b5c53481e1989be7e7847d3e