Merge "BA: Replacing API" into bt.lnx.5.0