Merge changes I38d43b72,I7b70a9df into qt-r1-dev
am: 0b4d9a04c8

Change-Id: If23f64eac5a0bf29b04113ed3a2c2a1f3c2df28e