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

Change-Id: I73aaf49a337d250838e954e434c34d9a008d9c99