Merge master@5428150 into git_qt-dev. am: 6f04e923b0
am: 96fc9d330e

Change-Id: Ib811464d80774674270b1b8c6168ced41f43a6ed