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

Change-Id: I2fff03813084209468b1835d6f2089a4c841fe3c