Snap for 5647767 from d7314a3bdb4c2a764edb763f0ebacd44f4be370a to qt-c2f2-release

Change-Id: I0fc755eb5d96435671e53b65608aaa5fa998cdf2