Snap for 5434517 from f90e5abc27d5c6694baabfd908ac36ef2dc11f1a to qt-release

Change-Id: I05c0efa7a8ca939b8e0993621cf35b49137e0e23