Merge "Updated string." into qt-r1-dev
am: c746066221

Change-Id: I0c7a7ba23fc45b9af828cfbd87a0d6c4ead18dc2