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

Change-Id: I30a22e1c267bc9e8bd287c48410cf9c475abdde0