Snap for 5626642 from c693cc9fadeb0987423c4aac581f2e69bdcef58b to qt-c2f2-release

Change-Id: I7f29a4cec9211ab4811b9189b088fa8addec5535