[automerger skipped] Import translations. DO NOT MERGE am: 11ebb14241  -s ours
am: 78f73c3352  -s ours

Change-Id: I56573cf23cf9cfb1f849f207afdcb3c63f2445e5