Merge "Fixing NPE crash in BF." into nyc-support-24.1-dev
am: 59c7734202

Change-Id: I19af8378aa57896996ff0522693d32450f7679d2