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

Change-Id: Ieb4d177e031103ab4d8a1fbda2402f1bf5fd5c50