Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbdd -s ours am: 1018a5d4 -s ours am: 311fa22e -s ours Change-Id: Ib222f7ef5dd91dba7814a9c10501c0f8b36cd2d0