Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 273bb516ad  -s ours am: b10ffae3cb  -s ours
am: fdcf37ea65  -s ours

Change-Id: I31e6c6ca6b2e21f6744c6e13b653ca8f1dfb1387