Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730  -s ours am: cc44ccf2f9  -s ours
am: 1f914332aa  -s ours

* commit '1f914332aa056c6902d3f8dda7025422ed38958b':

Change-Id: I9744fb39f54d9770c103f919499c90bae95e4544