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

Change-Id: Ib299c3c68c917bc1007ad4442a099b51451c3887