Merge "Import translations. DO NOT MERGE" into oc-dev am: d97c62a1da  -s ours am: b3291471be  -s ours
am: 9f32651e25  -s ours

Change-Id: If83d9e33526f1d2a72b7891680a964d6e24c779f