Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf2eaa1029  -s ours am: 2be91e7aff  -s ours am: 595fc656e9  -s ours
am: 1b2742a678  -s ours

Change-Id: I446ad5206055709f05ee30f9609e9de35a2e9c8f