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

Change-Id: Ic83e7a755169fb3a2336c2f8d9489c22619ba46c