Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266  -s ours am: 9a7789a0fc  -s ours
am: 97c257520a  -s ours

Change-Id: I23f07f62e4105b466db10ac1f0809ab3281fe55a