[automerger skipped] Import translations. DO NOT MERGE am: 054feb6f41 -s ours
am: 56cae52074 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f53f760800b199f6ea54a5426f20abef458dee4