Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 94744459d2  -s ours am: 03cde9c50a  -s ours
am: f34f2f9d92  -s ours

Change-Id: Ice4b719df20796120d7d44b09d7aad31f445a294