Merge bt.lnx.4.0 to bt.lnx.5.0

Commit till a9aa8e0d37bf2027e922642d5300c23bdeb7dde5

Change-Id: I617d8c1104b2cff8cef144f8c8eaafea48ac5671