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

Change-Id: I9bde57b325db65ef7890eaf52677638bca442092