[automerger skipped] Import translations. DO NOT MERGE
am: 5d216c7e57  -s ours

Change-Id: I31e67ae8d7b0397bcff2eb0cbe706a08a103b07c