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

Change-Id: Ib6ec40092b3a5ba7147e3470aebcec1efce61efd