Change-Id: I0b0ebcf20747a607ad9eed130d7b4fe810a1f2e1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
(cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)