Merge "Import translations. DO NOT MERGE" into oc-dev am: 916b47f868  -s ours
am: 17ddc39902  -s ours

Change-Id: I7c77457777d552cacbb9ea31b0c1b6fa419a14b1