Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 2c0df72ff6  -s ours

Change-Id: Id1c20a489505992dff768f5d29399262f047ca3a