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

Change-Id: I35dce809cd8ce72a471b362c90c95cacb5f5036a