Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: be840c80cb
-s ours
* commit 'be840c80cbf79a06a82acea65035f35c51a4cdac':
Import translations. DO NOT MERGE
Change-Id: I62c4f546f41886284b4c4b1c5c4c3b96b0ba23a8
This commit is contained in: