Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours
am: 5bbc5fe521  -s ours

Change-Id: I43cb6a9c7ea06c02575a53816cd649c6e0a4c2c2