Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2
-s ours am: 39265fb6de
-s ours" into nyc-mr1-dev-plus-aosp
commit
0559d7f100