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

Change-Id: I95a980c05129c91f825adabb3415bd1bab455120