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

Change-Id: Ie361c190b2a67dfced753c8988766f81a374aca3