Snap for 5821701 from 8331eb5abb402a64170ca7df3e036e0148e8e1c7 to qt-c2f2-release

Change-Id: Id7a1141a0363ed01aeb24a0d6a9f8da2f432fb71