Merge "Import translations. DO NOT MERGE" into oc-dev
am: 8864da5149  -s ours

Change-Id: I6cb8a94cee9188985185288fbf6320c1927bc0c1