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

Change-Id: Ib5e2634fd8d2d310255fbd93bf3619e29560679e