Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2fb78bafc7  -s ours
am: 4a4b0e5726  -s ours

Change-Id: Ie1d846377804bec15366f3d2ae97e7dbcba3730f