Merge "Merge "Remove unused strings" into tm-qpr-dev am: aaf0434b1c am: 1bbd4f97e1"