Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: cb4bea3ae8 -s ours
am: 25d12a4086 -s ours
* commit '25d12a408692f9267f20fa9b674516cf4b978331':
Import translations. DO NOT MERGE
Change-Id: I0b16c46e024e80f12b3690b3b4fceaa1d7cc87ba
This commit is contained in: