Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 2758e3af09  -s ours am: 748d6e3404  -s ours am: 62aaa59341  -s ours" into oc-mr1-dev-plus-aosp
am: 133837a79c  -s ours

Change-Id: I24e9ad512ae6d2f207806a319817f762716aaaf8