Merge changes I99720a37,I99a8f255 into qt-qpr1-dev am: 4bfd23eb78

Change-Id: I2614799daeb9065752c3dcc3baef697896bce7a3