Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 2a2845a483  -s ours

Change-Id: Icdcd43fdc8d15c24c38752005e6ef249913c3125