Merge "Import translations. DO NOT MERGE am: 961b18d42f  -s ours am: 4f596f6cf7  -s ours" into oc-dr1-dev-plus-aosp
am: d0b64ee2d2  -s ours

Change-Id: Id5a3c1dc85d8eba6fcac608a2d3586b6717a1802