Merge "Merge "Merge "Import translations. DO NOT MERGE am: 69d08382 -s...

Merge "Merge "Merge "Import translations. DO NOT MERGE am: 69d08382  -s ours" into nyc-mr2-dev am: 3bcdbff8  -s ours am: 6f24c015  -s ours am: 3c1c07a9  -s ours" into oc-dr1-dev-plus-aosp am: a9ea1f2f  -s ours" into oc-mr1-dev-plus-aosp
am: c367c765  -s ours

Change-Id: I75cb7807e05e7f16e4f957e9eb050f989c71a450