Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 451dc7e  -s ours

* commit '451dc7e146551c09d5d199113d484f07923d7086':
  Import translations. DO NOT MERGE

Change-Id: Iab53fea7693b353e7c934efcc036eb159b9f7ef6