Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 94942bb070  -s ours" into nyc-mr1-dev
am: 9c0ec1fe3f  -s ours

* commit '9c0ec1fe3f7792919600e6a249e105f14eacf3dd':

Change-Id: I269b87596e54c9e5b6f877edd7df54077c0a0e93