Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740 -s ours" into nyc-mr1-dev-plus-aosp
am: 16dd875f -s ours
* commit '16dd875f':
Import translations. DO NOT MERGE
Change-Id: I0b7186cfc4c89ab730fd60e6ea41064a51d0968b