[automerger skipped] Merge "RESTRICT AUTOMERGE Finalizing Q resources" into qt-dev am: 8bbcd7e4ac
am: 6a195db9f7 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9bc51ff5b99367753e21429bdb32157659330cf