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

Change-Id: I0e0cc787032a847d315fac6647e6dd2e9aa9b14f