Merge "Import translations. DO NOT MERGE" into nyc-dev am: 03add50400  -s ours
am: 092f25cd15  -s ours

* commit '092f25cd1582d9e95568d579344a99da5286dfe5':
  Import translations. DO NOT MERGE

Change-Id: I122fc8fe1acd89ecf84380ffeb4281390dda972c