Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50  -s ours am: 4df6ac860e  -s ours
am: cbe06ade4a  -s ours

Change-Id: I15e13340d4c033634fd762e328af70530d884017