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

Change-Id: I219b010519c5efae20ca065ca29257a1f876fd7e