Merge master@5428150 into git_qt-dev. am: a27ebe490c
am: 6234413982

Change-Id: Id9d1d6c03ab4730cd25ea20b5356709650a384e5