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