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

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9