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

Change-Id: I74d3cd75b6bcf35685b3f14a76fd1e3cb5c323ad