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

Change-Id: Iabd6baa0a3651c4d1aeb01de3fde00b68a79ef08