[automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7  -s ours
am: b15357267f  -s ours

Change-Id: I06cacb795cfaca029e65e1d593b290efa57c32b9