[automerger skipped] Import translations. DO NOT MERGE
am: 9b9d485f36  -s ours

Change-Id: I84dfe628fa23b413ab7b127f6eba89453c839b07