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

Change-Id: Ic698ae397c6cfb996922cc853595e55149c10b59