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

Change-Id: I1926ae43168fa88c14390130282d1517091c7129