Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492  -s ours
am: dd70db430a  -s ours

Change-Id: I0fa7cacb1558577d831d7d34bfc17bd00db348b0