Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 53c2954e4e  -s ours
am: 8d518cac98  -s ours

Change-Id: I9dd822ec13d9ebb3933e1ea0b6a5c9f72700c569