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

Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74