Merge master@5428150 into git_qt-dev. am: 8cb08b92e5
am: 09c312b840

Change-Id: I9369f27f4554f7d97d347c924e50cb04abb45066