Merge "Import translations. DO NOT MERGE am: 71504c9da3
-s ours am: 2f2fb2fed2
-s ours am: 653c4fd7a9
-s ours am: 83f366f284
-s ours" into nyc-mr1-dev-plus-aosp
commit
d54f1ab9f2