Merge "remove [email protected]" into qt-qpr1-dev am: e6699a99b0

Change-Id: I0ddc7e2c7b416d01d4984494906ef3f77ab9acdf