Merge master@5428150 into git_qt-dev. am: 05f1427af4
am: 0a410d02bf

Change-Id: Iaab97e687fae2cc132de5b1ce5a30b6061e46b00