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

Change-Id: I4b9c9b2147144a2d407b6389ed3ed0cf0ab05428