Merge "RESTRICT AUTOMERGE Finalizing Q resources" into qt-dev
am: 8bbcd7e4ac

Change-Id: Id245f73587165f9841f566f626d8ce7133dbcb3a