Merge "Update strings" into qt-r1-dev am: 151dc3d2a6
am: 16590e52b8

Change-Id: I5adeb87a24ce7dce2eaa46249ca59a774ba060dc