Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours
am: 9b94308cec  -s ours

Change-Id: If5e639d09b5d809a687a49181dfdddddcbb91f6d