Merge master@5428150 into git_qt-dev. am: c2f57fb004 am: a41a90c001 Change-Id: I9e3da9a443e95cc2ecea4867818ebbc56c6a967d