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

Commit till 8c981e286d15604963afc68b196b4cc64557ab4c

Change-Id: I34b7e1714f1a27471fe5137fc11618bfad419936