Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a759c93b8  -s ours
am: 96e57619af  -s ours

Change-Id: I3c25e7aab9fcc9a242353034d1ca5f2d8adc637e