Merge "RESTRICT AUTOMERGE" into qt-dev am: 04897a9bbd

Change-Id: I7043cb594932301380328828e7b652d896240a64