bln: replace with one from upstream v9

Change-Id: I4ce3f62248c02fe4b66bb10e9f5370699bc62c49