Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 89688902b8  -s ours
am: d3528de4c9  -s ours

Change-Id: I05bcb32b3c013d15a76939a3a974f88d36d94aeb