Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8f8d12fd45  -s ours
am: b8f6b581d8  -s ours

Change-Id: I0dbca369aeac5d132656110edb60e76b8ef016bc