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

Change-Id: I59f002be824830c9ab3224c25c9d9d39edca43f1