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

Change-Id: I6e62e3c7900db946a04163e4b2a4dbd1b6b1170f