Merge changes I4a47d83c,I72d4e344 into qt-dev
am: 97559d9bd8

Change-Id: I0f257af7281cd0d246b9e60d102399de230332f5