Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7fa7ad595f  -s ours
am: f9e78343ef  -s ours

* commit 'f9e78343ef8dd8fa084974b19e090746707bea6b':
  Import translations. DO NOT MERGE

Change-Id: Ife8edf81f892fd453c7f83210e49d8836adafa24