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

Change-Id: Ib5e68daef2d2fb7b5b871ca68969f15881755bdd