[automerger skipped] Import translations. DO NOT MERGE
am: 8d0074b5e5  -s ours

Change-Id: I89a561edb5836a3df2dd6195241eb82417554247