Merge changes I5694a38e,I488f90aa,Ie9644dc8,I8d5b5b53,Ib8a0fa19 into qt-r1-dev am: 2cfa02421b
am: 0f1159df4f

Change-Id: I1b03b76dca5008a0011bb33581cc70c22d9d76f3