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

Change-Id: I3ec11737f8a8b8e959a298622c225480a4c4948a