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

Change-Id: I2219bd5cfa62325ccfd20fa957569a5bf40b942b