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

Change-Id: Ia43318041306a97daedc5fd2409caf61ef4f4456