Merge "Import translations. DO NOT MERGE" into nyc-dev am: 39884131c0  -s ours am: c8b42d6674  -s ours
am: 262e63532e  -s ours

* commit '262e63532e87e7ae6d1c070f9e7a321b24795a09':
  Import translations. DO NOT MERGE

Change-Id: Ie9860890e436085f41b39a48801f726e981fa796