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

Change-Id: Ia61c47578eeac9029f5a4bed15885700b3cc7e1c