[automerger skipped] Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev am: 360a06de68 -s ours

am skip reason: Change-Id Ifd5ed106d3b46377f0d7cd2d1e565cde45ab06f9 with SHA-1 9a8da2dc24 is in history

Change-Id: I13d9dcdd8f14ae9ef9e102ecd37d7554c845bc04