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

Change-Id: Ic877cdaafc996cebb2b1919ed8d1d266714a7f65