Merge master@5428150 into git_qt-dev. am: 146c8d0123
am: 9f3a975a6c

Change-Id: Ifc2391e84ca9c64569376e6a18bd5e45a475229b