Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3f9462d6a3  -s ours

Change-Id: I67cf707cf9eb5184865edfea8535b81d413e0807