Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d  -s ours
am: f2475c29e1  -s ours

* commit 'f2475c29e1641f84a191fd6a42528487e29eed58':

Change-Id: I734396193f15c59fdbd241774257f7df7b7eac8f