Merge changes from topic "b135715570-test-memory-leaks" into qt-dev am: c5ab1e8f8a
am: ccedca8d86

Change-Id: Iddb2c78da78d19caa5873abb3f0f5a88ba4b454a