Merge "Import translations. DO NOT MERGE" into nyc-dev am: 26c1e22e29  -s ours
am: 37dc840451  -s ours

* commit '37dc840451a585740a38813af56e13225e32086f':
  Import translations. DO NOT MERGE

Change-Id: Ib7e63df1f70d01ea954acb38328669bf307cf53a