Merge master@5428150 into git_qt-dev. am: a80753cece
am: 7572344ea5

Change-Id: I04d45056b2d06ca4fc1b2c3b9337798e5be2994b