Merge master@5428150 into git_qt-dev. am: e85c94e4ab
am: af22422813

Change-Id: If96d4cccfebed8b1d309d13d363984a16c3af28c