Merge changes I0a5c576b,I54fcf97b into qt-dev
am: d1cbccb628

Change-Id: I795b95edc9648e01bd5c654ea6c26fd68cbb8586