Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 6c4c6b047c  -s ours
am: d33ed97339  -s ours

Change-Id: I209a4d9e4a7cfa4c019fa1d7c87a53e1298b1a71