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

Change-Id: I7a2efc0b181c441ce4e19b5c3fb127671bdb4972