Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb07b0b372  -s ours

Change-Id: Ibc2fb6d61c5e391b9804411bd6e0d1f646766910