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

Change-Id: I4ffc73d9a98db7fe917fe4db0518fdfce70b2b1b