Merge "Import translations. DO NOT MERGE am: ed22521f97  -s ours am: 3403a93d2c  -s ours am: cc9896a5e4  -s ours" into oc-dev-plus-aosp
am: 8fa8333719  -s ours

Change-Id: I5429742f9267ae22745e9f2c9c26a662115d9198