Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 94744459d2  -s ours

Change-Id: I681ca3e2800410e1f7ce5d7d41bd58b6bfbbdc83