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

Change-Id: Ia559a0124045302ccde7de2b65143ceb0769bcd7