Snap for 5719479 from 0300f18d862046ac05e9c6a0f58ff44d36bef7a5 to qt-c2f2-release

Change-Id: I11721291c0fe758c6fc6ecceeb4c2538ab9b17e6