Merge commit '7bbc797715f02e5b080c47d9af8de51cfd41c864' into bt.lnx.5.0.r5

Change-Id: I74dab2f2f6c3fed7ef94059ad2112875e6534595