Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours am: 3cd12a1ca7  -s ours
am: 516b3e7195  -s ours

Change-Id: I60f074c5eb4cd1d50ec22a9c1860e84e6f2d4bfe