Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9  -s ours
am: a1ba60ce29  -s ours

* commit 'a1ba60ce290894003a164a5e08d46a50f323532b':

Change-Id: I2c15fa3c3ee3ff7492b2c809d734866f8cac4e11