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

Change-Id: Ie42d39dab5f605b753def7d48e384e12cbda0e46