Merge changes I41e08b86,I7760f37d into qt-qpr1-dev
am: 30e495d0c4

Change-Id: Iae876b13f07a0bfe55baff58ca672d93a0f461e3