[automerger skipped] Merge "Move default setting of a product variable" into...
[automerger skipped] Merge "Move default setting of a product variable" into qt-dev am: 43b86c01 -s ours
am: 660b9138 -s ours
am skip reason: change_id I25faee7ec0a3fff17e1d08b834d868834effda36 with SHA1 584d3726 is in history
Change-Id: I7278dead1b63a844c32ef612cb43df644efd9ada