Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 869a72294d  -s ours
am: fbc93c9ef3  -s ours

Change-Id: I820c555adb10e3a407b905d15f5eef0904804ce0