Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c  -s ours am: 8469c01294  -s ours
am: f3154c6763  -s ours

Change-Id: Ie909ff8d5138e71f5d2514f0f017dd135e2c1dc8