Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146  -s ours am: b3d3104969  -s ours" into nyc-mr1-dev-plus-aosp
am: 3658e10468  -s ours

* commit '3658e10468d551b98e54e15bb4cabac153c6258f':
  Import translations. DO NOT MERGE

Change-Id: I1dd3967ed9f6e46d44637a38bd1fa0e4c78af690