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

Change-Id: I46a013fa04395eb805c3a451788b981f553b520f