Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 4a1e89ba44  -s ours am: 725be4160c  -s ours
am: b91a2fe1a2  -s ours

Change-Id: Idbf99c4297fda6d39e962b4676ecdc567ecfe1e7