Merge "Import translations. DO NOT MERGE am: 4bf388ecbd
-s ours am: 9441334fce
-s ours am: 7910ade9dd
-s ours" into nyc-mr1-dev-plus-aosp
am: e1fc7ec0ab
-s ours
Change-Id: I9f02952e16c336dda7d5fba5502540e09b01e4f3
main
commit
85b35ae9bf