Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01abe42307  -s ours am: a010b535d6  -s ours
am: 37bda39adb  -s ours

Change-Id: I69d3dd8af51b83c23f9749585baef8cc8f7bee13