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

Change-Id: Icce75679df5c81b9752898dc8e30a8b31edf1aa0