Merge "fix(bl1): prevent null pointer dereference" into integration