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

Change-Id: I06f6aac266b9972c19afa7eeb24f6f07a952fe7a