Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: b26da96c2c  -s ours" into nyc-mr1-dev
am: e25ec60c3c  -s ours

* commit 'e25ec60c3c5e93ed7355ccb3227032b883149e1c':

Change-Id: Id5b662bc53abab8dd49a5dcd80a175a88d1a88d8