Merge "Import translations. DO NOT MERGE" into oc-dev am: 288e7f54d0  -s ours
am: e67e2f0018  -s ours

Change-Id: I5e363ae7a3528a2252a5e1b3111f7f901fc3c337