[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532
am: 1221af165e  -s ours

Change-Id: I87afb96b009dbc4bfbc152d5764bc8728f0b0fef