[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd am: b5d5a667c3 -s ours

am skip reason: subject contains skip directive

Change-Id: I523af1dfd88c4b1af0665ca3d23d7fedac4f2bfe