Merge "Import translations. DO NOT MERGE am: 69d0838208  -s ours" into nyc-mr2-dev am: 3bcdbff889  -s ours am: 6f24c015ef  -s ours
am: 5d74b7d676  -s ours

Change-Id: I51ad9da8af1dedb69b71c6950e5529d30f9a0548