Merge changes from topic "b135715570-test-memory-leaks" into qt-dev am: c5ab1e8f8a am: 654a92e046
am: 4be8327072

Change-Id: I138b32bbf3166daa6afb70a2bd00752590559d81