fixing build issue in tests
Merge branch 'master' into messaging_framework