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

Change-Id: I443ed7404e199e87ec76d7f4724f0b66de7f3e19