Merge master@5428150 into git_qt-dev. am: 2a7b0c0b4f
am: ee23ce3fba

Change-Id: Ib204eacff59bb6c14a0f3b05fc038730c8fea1ee