Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8e44108cf1  -s ours
am: 0b076441a2  -s ours

Change-Id: Ie7e1cd97a519177a7fdfe9d6a634365f39d2bb5e