Merge "Added missing placeholders to translation string." am: 6d3dc51922
am: cf8600732b

Change-Id: I60089dfd466f75c3aa4c56b8846e3fa40479bd46