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

Change-Id: I8713e3fa744ae4dd7de3cc9cd841f621e3f4d88e