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

Change-Id: Ib4f96d17663c1bb67a3a9058e011cc8aa52197a6