Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5  -s ours am: 1018a5d4a1  -s ours
am: 311fa22ecb  -s ours

Change-Id: Ib222f7ef5dd91dba7814a9c10501c0f8b36cd2d0