Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1  -s ours
am: 131ccb00a8  -s ours

Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691