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

Change-Id: I35c29bd54323f3c9732abf53333b316f82ccedd6