Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8e44108cf1  -s ours

Change-Id: I5a141346add5639ce1bf707ce5097859cce3bde4