Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2  -s ours am: 8b44d3722d  -s ours
am: 0c4e14d0ae  -s ours

Change-Id: Ie5ff3962adbf96ef93464061d61c0ab15917281b