Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a816be1f8a
-s ours am: 91e7c661a6
-s ours
am: 36ef242969
-s ours
Change-Id: I103ae2b15fd1c39135bca32f8b5462c76d7aad84
main
commit
98a5e0840f