Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e
-s ours am: 42d8dccd89
-s ours" into nyc-mr1-dev-plus-aosp
commit
0b2f35fb3d