Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a
-s ours am: 919ba24275
-s ours" into nyc-mr1-dev-plus-aosp
commit
424e13df65