Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e  -s ours
am: 69f203705b  -s ours

Change-Id: I86fa51dc1b351c0ba80d5b7401deb47484a7670d