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

Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215