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