Merge "String review follow-up" into qt-dev
am: a78b3bac8f

Change-Id: I2b46341d0482516c6aec7a6b22134060d0ca75b6