Merge changes I089fa8ff,I8db745c1,I6fa83189 into qt-r1-dev
am: a0aa088c9f

Change-Id: I6d97a64ad21a4125761da9a833ca4bf0654e7642