Merge "Import translations. DO NOT MERGE" into oc-dev
am: 899ca73297  -s ours

Change-Id: Id1acf037028ea2db8fdd42ab69c51665ed4295b6