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

Change-Id: I7c30321b70de8f0f35057356b17673a15f6b2b09