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

Change-Id: I0aeaa173964040b89f8711cc222f8845e2316fae