Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0b18f2c06f  -s ours
am: 01f73cce2d  -s ours

Change-Id: Ie0b66edfd08ddcaaad0bec6c88a9c08d87c87c5b