Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf2eaa1029 -s ours am: 2be91e7aff -s ours
am: 595fc656e9 -s ours
Change-Id: I9f9a6af3a0757e0414b0e9d7affacbb83afa5b24
This commit is contained in: