Merge "Import translations. DO NOT MERGE" into nyc-dev am: b731377822  -s ours am: af5045cbd9  -s ours
am: 9ed0bcb3a4  -s ours

* commit '9ed0bcb3a4cd845c6b7554774c59b17bb629ac23':
  Import translations. DO NOT MERGE

Change-Id: I3dc34cb9b9b73cb1dd4add2e0a21ff59a5131bbc