Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e0ca918e23  -s ours
am: 29a8e54150  -s ours

Change-Id: I90942d58c2585a26089b305fc21727e67969da98