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

Change-Id: I0dd23993b72e826f8bf6ac8df3542aa7fee88595