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

Change-Id: If22150c06b3d31d90e77b65f4c76ad1c4d56b797