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

Change-Id: Ie8604396f15d64875aa09f8208c20b6503d77306