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

Change-Id: I135138575553b990bbb4299536d363e0cf57f318