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

Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972