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

Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1