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

Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2