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

Change-Id: Ic5c34305f70e57e2b1f4ffde7aac9a603b650b61