[automerger skipped] Merge "Fix regression in PFD#fromData" am: 59566aba2e
am: 77e446821a -s ours
am skip reason: change_id Ic82006c9cb48f580aaad942c4679e774186382c9 with SHA1 12ea937f8f is in history

Change-Id: Ia0094dc764305284baf64da2c41420537cdcec2d