[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9b am: b5d5a667 -s ours am: 91500f3e Change-Id: I5cb31d1cae3cda37c9b0440ecaf282c52d4cd557