Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636  -s ours am: 3183fb75ac  -s ours
am: 355ce9eb98  -s ours

Change-Id: I2493d1958fae0d464e736cf89fd1307a8a68ea49