Merge "Import translations. DO NOT MERGE" into nyc-dev am: a4bfd03cd5  -s ours
am: e235b490de  -s ours

* commit 'e235b490de7d0102bae20938bbc3de838d97a969':

Change-Id: I3ac4c637c192a7a019b8170993b5469f2636fdb4