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

Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4