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

Change-Id: Ia9a3f3160ea84706d322bae9eccf5516d2b38d59