Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a  -s ours
am: 521faf362a  -s ours

Change-Id: I31e63888d11657f0ead8732e6af22282d66a23b5