[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours
am: 76a64e725c -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4ed166f31bfe390769f853c169a1b661dd811e0