Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9006745cd0  -s ours
am: ab1cc63006  -s ours

Change-Id: I9db34261bd07d816a31feccf0d9eda4e8ed6d70b