Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1e40ddc47a  -s ours
am: b28dedff56  -s ours

Change-Id: I42fa2adcd8731649f412d5044e94bf4b0c55299e