Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: bed643ec81  -s ours
am: 4ebc864729  -s ours

Change-Id: I41ff1bb8a5272726a44b8fc9d2b4836ce422c1cd