Merge "Import translations. DO NOT MERGE" into nyc-dev am: 39884131c0  -s ours
am: ca5c3cce0b  -s ours

* commit 'ca5c3cce0bbc646a3d3d883057575489dc7e7f4d':

Change-Id: I64f79d0ee720024f27cd17d503db06bceb74bdcd