Merge "Fix regression in PFD#fromData"
am: 59566aba2e

Change-Id: Ib2b5eec2811ec9b856177cbc2b1643ad87a22a8c