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

Change-Id: I4137b8071cc8134687cfaac3ab38d9f86125edb0