Merge master@5428150 into git_qt-dev.
am: 6f04e923b0

Change-Id: I4aa985095b45e6f28936ed81c86b8afdee80e8fa