Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours
am: 611a6ffe29  -s ours

Change-Id: I4c8c61a56288b7b4fdad4ccca07c51c0a8cfb38c