Merge changes from topic "cp-fingerprint" into qt-qpr1-dev am: cc07b65678

Change-Id: Ie1770bcd2ae70b21105da90e7d3e75504e107199