Backport from FW_51.

Bug: 12928
BFN