Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours am: 5bbc5fe521  -s ours
am: b4b0c6acb4  -s ours

Change-Id: I3cc6305086fb24b1d732288d2c8d7880dbd5a0ec