Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d8330556b3  -s ours
am: f102825d6d  -s ours

Change-Id: I07492193d0235ee255103cc93016f6ae191706ec