merging from trunk for BZ 15053

git-svn-id: svn+ssh://source-control/sources/repo/bt-dev/branches/Platform-8.2/src/linux@68331 9fc1c11e-11b2-4e14-94d8-6c5e05775969