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

Change-Id: I6c27d084089824f6c405af45e0d22725ca8d84b1