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

Change-Id: Ibcba82d982256e9937f8fbf4910fa8950aac83ed