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

Change-Id: I18cc399f3c272ce09f484f31d6aa7affeba00f91