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

Change-Id: Ic0f9b8e1ab1cda9bcacd8c2db6a9cf3d909c12e8