Merge "Update strings" into qt-r1-dev am: 9f17f84a10
am: b03f2e5183

Change-Id: Id131b1518ded7aa652c749f3094d4ddab629dec4