[automerger skipped] Merge changes from topic "cp-fingerprint" into qt-qpr1-dev am: cc07b65678 am: 8db07a5d54 -s ours
am skip reason: Change-Id I163a3c6558117455038608e15065e076e2dd82d2 with SHA-1 67ce22c57b is in history

Change-Id: I4ef2cc2bb8ff5c23ec2562b37c7b72cc4e85d825