Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1c5bd422fd  -s ours
am: 398be102c0  -s ours

Change-Id: I53cc321bfcc29cebe8fc9df9353c2c1515570a0d