Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 852e0aacc2  -s ours
am: ed8860238c  -s ours

Change-Id: Ic97752e1d08ed4f9e8a9b914608f170f48cdc292