Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be -s ours" into nyc-mr1-dev-plus-aosp
am: b8b4aba4 -s ours
* commit 'b8b4aba4':
Import translations. DO NOT MERGE
Change-Id: I49b846c4fb947beef95cfcfe20ab7ef1be652233