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

Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84