Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 59d2257e83
-s ours
am: 24f910f68a
-s ours
* commit '24f910f68ac2bd86d644eae79b3f8dfc333c5804':
Import translations. DO NOT MERGE
Change-Id: I8522a8df167904441ad122554848101104370f4e
main
commit
66e52b17ea