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

Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9