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

Change-Id: If9a4c0210b1e950bc42cda261d50ca55c124e07b