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

Change-Id: I960177508b7324233b2bef0ba7513d3d8366ec09