[automerger skipped] Import translations. DO NOT MERGE
am: 30c0f66dd5  -s ours

Change-Id: Ida7d351910e784d8dabd51264d65677c952c43f6