Merge master@5428150 into git_qt-dev.
am: e940254e00

Change-Id: I031539f9406843668f6993289f8af8852d7b3390