[automerger skipped] Import translations. DO NOT MERGE am: 7007fd05ec  -s ours am: 4690364126  -s ours
am: 89ad15af36  -s ours

Change-Id: Ic9f26c775b1a782cc1d51a15a7c72523fffcd104