Merge master@5428150 into git_qt-dev.

Change-Id: Idf32144c9ba866c8219fe21de1cfc4f7f8386768
BUG: 129345239