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

Change-Id: Ic7ed5110a3be5d2f4d8be1edf074c3753989585d