Merge "Import translations. DO NOT MERGE" into nyc-dev am: 41a1d11f98  -s ours
am: cdd880f96c  -s ours

* commit 'cdd880f96cb75ff3b57e16c9ed2ede9fb660b27a':

Change-Id: Ia58f7927338537efb7a48c69ff5b4e5092e227ff